From: Jan D. <jan.h.d@swipnet.se>
Date: Sat, 9 Jan 2010 12:13:15 +0000 (+0100)
Subject: Merge from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8236^2~48
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=15f54f7f2f55180d35a0e434ce7a6285a63023ee;p=emacs.git

Merge from trunk
---

15f54f7f2f55180d35a0e434ce7a6285a63023ee